Merge branch 'master' of https://github.com/gpsbabel/gpsbabel
authorRobert Lipe <robertlipe@gpsbabel.org>
Thu, 29 Dec 2016 06:02:19 +0000 (01:02 -0500)
committerRobert Lipe <robertlipe@gpsbabel.org>
Thu, 29 Dec 2016 06:02:19 +0000 (01:02 -0500)

Trivial merge